Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be." into ics-mr0