Merge "Fix for shadow 'leak' reported on SPIN homescreen." into devel/master