Merge "Gets the contextual drawable correctly when rotating device"