Merge "Adding flag to flash only static partitions" into main