Merging WindowSizeStrategy with BaseActivityInterface am: d9c0349c1a

Change-Id: I1bb7d1b6d1cbc25697017193034207a5184aeae7