Merge "Remove ActivityManagerNative dependency for adjusting font scale"