Merge "Remove usages of now removed getThemedContext()" into qt-dev am: d011e3d79e
am: 22fd366193

Change-Id: I472be259b07b1028f3f324c264ddfb1ddbcfb450