Fix for testFreeformWindowManagementSupport am: 0fe8e72c2f am: e1cfbf8c19
am: 983115c3dc

Change-Id: I04ddd44261e7cd230618cb90a8c3de1e342ee947