Merge "Wait for uncrypt to finish before rebooting" into mnc-dev