Merge "Fix App Compatibility Settings' lifecycle"