Merge "Fix GudiedStep GridView focus 2nd try" into mnc-ub-dev
am: e12b873

* commit 'e12b87372d9c4c745fa54e124947316e0ecc6c88':
  Fix GudiedStep GridView focus 2nd try

Change-Id: I3d21829267ead27d0025f5ad4a2d58bed5a80c2a