Merge "Fix dashboard shadows on tablets" into mnc-dev