Merge "Remove redundant mFocusedApp from DisplayPolicy"