Merge "Fix failed test in order to enable Live Tile (in the next change)" into sc-dev