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

Change-Id: I6ca9430036a5cf322726279a9c1b1be7f5a8ec98