Merge "SEAndroid: Address bootup denials for display"