Merge "DisplayLayout set() include copy new mNavBarFrameHeight" into sc-dev