Merge "Improved the behavior with the empty shade view"