Merge remote-tracking branch 'upstream/master' into 833149
Bug 906055 - Fix awesomescreen cache