Merge "Fix dream not working on top of pinned apps" into sc-dev