Merge "FocusFinder use CalculateCurrentScreenExtents" into devel/master