Merge "Fixes missing folder label after launcher restarts. am: e148652075 am: d1137b8c89" into rvc-d1-dev-plus-aosp