Fixed overlay positions for rotated images

Also updated AppCompat to 21.0.2