Merge "Fix select dir button enabled after rotation." into rvc-dev am: 5746c2e424

Change-Id: I61c911118940736f07e88500a2ffd59fb59dc492