Merge "Fix NPE in getCompatibleMagnificationSpecForWindow" into sc-dev