Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39' * commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39': Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39' * commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39': Semi-workaround for #2027266: app drawer showing up on the side of the screen