Fix for wrong bitmap picked after geometry change

Change-Id: I48d7892c761bb1d8a83553786367aa11d1841fb5
5 files changed