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