Merge "Clean up LAZY_INFLATE_KEYGUARD flag" into main