Merge "Add multi-display support for boot animation"