Merge "Revert "Add default keyguard fod dimens"" into q10