Merge "Make sure the app can draw a frame before unlocking" into mnc-dev