Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev